PATCH: config.c: problems with #tryinclude statements, whitespace #48
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
InterLinked1
requested changes
Nov 9, 2024
There was a problem hiding this comment.
These can be added until they are merged upstream, but since they are already Asterisk PRs, we don't need to duplicate the patches here, that way it's less stuff to remove later after it merges.
It can be done with just a single line, like so: https://github.com/InterLinked1/phreakscript/blob/master/phreaknet.sh#L2207
You can use asterisk_pr_unconditional to pull in both of these (and if it can be in that section, beneath the other config patches, that would be great). The total diff should then be just 2 lines :)
A side benefit of this is if the Asterisk PR is updated, the latest patch is automatically pulled in.
Allan-N
force-pushed
the
asterisk-108-fix-tryinclude-and-whitespace
branch
from
83b4b4a to
d988628
Compare
InterLinked1
requested changes
Nov 9, 2024
phreaknet.sh
Outdated
| @@ -2205,8 +2205,10 @@ phreak_patches() { # $1 = $PATCH_DIR, $2 = $AST_SRC_DIR | |||
|
|
|||
| ## Unmerged patches: remove once merged | |||
| asterisk_pr_unconditional 917 # FreeBSD compilation fixes | |||
| git_patch "config_c_fix_template_inheritance_overrides.patch" # config.c: fix template inheritance/overrides | |||
| git_patch "config_c_fix_template_writing.patch" # config.c: fix template inheritance/overrides | |||
| git_patch "config_c_fix_template_inheritance_overrides.patch" | |||
There was a problem hiding this comment.
Why remove the comments from these 2 lines?
phreaknet.sh
Outdated
| git_patch "config_c_fix_template_inheritance_overrides.patch" | ||
| git_patch "config_c_fix_template_writing.patch" | ||
| asterisk_pr_unconditional 918 # config.c #tryinclude fixes | ||
| asterisk_pr_unconditional 971 # config.c fix issues w/ whitespace |
Pull in Asterisk pull requests for the following issues : 1. asterisk/asterisk#920 asterisk/asterisk#918 Correct an issue in ast_config_text_file_save2() when updating configuration files with "#tryinclude" statements. The API currently replaces "#tryinclude" with "#include". The API also creates empty template files if the referenced files do not exist. This patch resolves these problems. 2. asterisk/asterisk#970 asterisk/asterisk#971 Configurations loaded with the ast_config_load2() API and later written out with ast_config_text_file_save2() will have any leading whitespace stripped away. The APIs should make reasonable efforts to maintain the content and formatting of the configuration files.
Allan-N
force-pushed
the
asterisk-108-fix-tryinclude-and-whitespace
branch
from
d988628 to
2f959df
Compare
InterLinked1
approved these changes
Nov 9, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Creating phreaknet patches for the following Asterisk issues / pull requests :
config_c_fix_tryinclude.patch
Correct an issue in ast_config_text_file_save2() when updating configuration files with "#tryinclude" statements. The API currently replaces "#tryinclude" with "#include". The API also creates empty template files if the referenced files do not exist. This patch resolves these problems.
config_c_fix_whitespace.patch
Configurations loaded with the ast_config_load2() API and later written out with ast_config_text_file_save2() will have any leading whitespace stripped away. The APIs should make reasonable efforts to maintain the content and formatting of the configuration files.